Differences & Changes to og_forum by function #og_forum_menu - mostly a rearranging of menu items - added 'path' => 'forum' to intercept calls there - I don't think the above can be cached - left out MENU_NORMAL_ITEM since that's default - spacing & capitalization #og_forum_page - since I copied and changed the theme fuunctions, this needs to reflect that - handle a little bit of group context getting/setting; if user shouldn't see the page, deny them - the above, along with a couple of checks in other functions take care of all cases; i.e. viewing forums through /forum, /og_forum, directly from /forum/#, or even the node directly, etc. - allow #theme_og_forum_display - new - copied from forum module and modified links to work with integrated forum/og_forum - changed 'Post new forum topic' to only show up in forums, not containers; instead tell user to 'Select a forum below' #theme_og_forum_list - new - copied from forum module and modified so it will work with integrated forum/og_forum #theme_og_forum_topic_list - new - copied from forum module and modified so it will work with integrated forum/og_forum - this finishes the theme problem of integration #og_forum_settings_submit - per 4.7 to 5.1 module update standards, changed _POST['op'] to $form_values['op'] #og_forum_set_og_group_context_from_tid - new - I found I was duplicating code, so made a little function to identify a group and set the context based on a TID #og_forum_gid_from_tid - new - this is similar to the above, but doesn't set the context, just returns the group based on TID #og_forum_db_rewrite_sql - this is the most complicated change - use $restrict2 instead of check the same things twice - use "if (((arg(0) == 'forum') || (arg(0) == 'og_forum') || (db_result(db_query('SELECT type FROM {node} WHERE nid = %d', arg(1))) == 'forum')) && ($user->uid != 1))" to determine whether to restrict viewing of nodes or forums; intercepts both forum and og_forum menu paths for integration of forums and og_forums - in condition to set $restrict2, make sure we restrict only when posting from within a forum; don't restrict the uid==1 - under first $restrict, rather than build query of allowed forums (which eliminates regular forums as a side effect) in JOIN, use subqueries in WHERE to remove unallowed forums instead; whatever remains are subscribed (and active) and general forums - under $restrict2, use a combination of the old JOIN and the new WHERE; we don't have to be as strict here because we have an arg(3) which narrows down our focus for us #og_forum_nodeapi - add 'load' and 'view' to take care of some og context issues - change 'prepare' to use arg(3) and context for forum/og_forum integration #og_forum_is_admin - only display og_forum management links if the user is a manager of that group or is user #1 #og_forum_og_create-links - since the container is now grabbed, we can truncate the link path and still get to the right place #og_forum_form_alter - make use of context functions - if we're in an og_forum, make sure that the new post goes to that forum only; the strictness of this is required to make forum/og_forum compatibiility work - did not address audience issue; should be optional; admin should be able to hide it; for now, my intention was for forum topics to not participate in audience (do posts really need to go to the front page of the forum?) #og_forum_manage - no appreciable differences #og_forum_form_main - new - similar to forum module - handle deletion here instead of in og_forum_form_forum - for add and edit, call og_forum_form_forum with the variables we know (and need) #og_forum_form_forum - minor changes to use the og_forum_form_main - should functionally be the same execpt for... - set $form['#base'] = 'og_forum_form'; so the following functions are called and not the forum module versions?; was this uneccessary? #og_forum_form_validate - not changed #og_forum_form_submit - not changed #og_forum_confirm_delete - not changed #og_forum_confirm_delete_submit - not changed #_og_forum_manage_breadcrumb - changed so forum paths say og_forum instead since we're managing og_forums #_og_forum_ogterms - not changed